merge with wrong git