Stablility level 1
Merge conflict fixed and  gitignore update for work folder