updating files
resolve merging conflict in memo.txt