resolve conflict
try to fix conflict