final v3 file name confliction resolved