made merge files work