got rid of conflicts