Trying to fix the merge problem