fix file-names & merge