memo.txt for uml information
updating memo.txt after resolving conflict