accidentally merge wrong branch