Removed merge conflict lines