attempt at a merge conflict