resolve conflect