Removed Git conflict appendage