merge some files from nextalk