dir6 change in test4
left conflict in place in test4