changed file names to converge at marging