manually merged some files