merge off Bare Master