Removed Git merge conflict lines