merge with branch