Trying to fix the Git mess.
Merge branch 'develop'
Merge branch 'master' into develop