fixing a conflict