Fixed merge conflict artifact