Rollback to the last commit before unfortunate merge