Manually merged some files.