Removed conflict markers and updated and error message