trying to add conflict