fixed merge conflict artifacts