try conflict
Fix conflict