Removed conflicts artifacts (not sure it will work)