took out conflicts