recovery after major OS issues and merge collision