Removed extraneous conflict marker