merge our files