merge some new files