Fixed unintended diffs during merge conflict