windows pc master change
after pull from master
added by notepad backup
resolve conflict after pull and merge from master
2nd change ubuntu