fixing files from merge