Git Abort Merge From One Branch