Return errors if there are any
Merge branch 'refs/heads/develop'