Fixing terrible merge comflicts from other people