commit to sort the merge problems