Added Merge for pull request and error messages on return