test to make sure conflict is fixed