conflict is resolved. perhaps