Get the root first
Merge branch 'develop'