files merged manually