Got rid of conflicts