getting branches merged and up to date