there aren't merge conflicts