Fixed branching merge issues