some work on try
added stuff  on master
added stuff on try
last commit on master
solved conflict
before revert
some more stuff