conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts