Bugfix/merge not merging maybe
1.1 Release, Better Error Handling and Better Logging
Feature/better error handling