final v3 reformatting + link file nameing confliction resolved