Removed all the merge stuff.
Merge branch 'feature/fixing-new-provision'