text file added
merge fix