another change done locally to check.txt (branch master)
resloved conflict between github and local