conflicts maybe resolved