Small merge conflict