gotten rid of conflicts