fixed merge artifacts from rebase