In which git merges cleanly but it doesn't compile anymore.