corrected artifact name
merged conflicts