Too stupid to fix all conflicts at once