Remove merge conflict lines
Remove more merge conflict lines