try to see whether we need to commit stuff
Merge branch 'testingBranch' into develop