change test3, dir7
left test3 conflict as is