rm conflict merge artifacts