removed conflict artifacts