t6036: Add testcase for undetected conflict