Add a rename + D/F conflict testcase