Trying to fix problem with merge conflicts