conflict with branches resolved