help.txt commited
resolve conflict