conflict with branch2