fixing the merge error