merger conflict completed