Learn more about cloning repositories
You have read-only access
Removed an errant git conflict marker left over from the last merge.
