removed artifact from merge conflict