Now the merge conflict is fixed