manual merging of files

May be some errors. time to dota