Stashing to change to master branch
Fixing merging issues