Trying to match merge conflicts