got rid of conflict