Removed git autogenerated conflict markers