numerous merge conflicts: files removed and added again because of
enormous numbers of conflicts