merge some files from other branch