merge two local branches