Removing lock file
Merge branch 'dev'