fixed merge artifacts