rm botched conflict