You make 1 bad merge conflict and everyones all feisty