Another merge conflict correction