Removed leftover git conflict markings