Trying to fix the merge error