Attempt at merge conflict