Removed extraneous merge marking