Sounds like this guy writes big balls of mud with constant churn. Merge conflicts should be extremely rare when the codebase is well encapsulated.