Committing stashed file.
Merge branch 'develop'