merge and remove wrong branch