Remove these merge markers, and the import.