Schonz

Thanks for opening a new PR with the conflicts fixed. Please create a new [Jira Issue here](https://issues.apache.org/jira/projects/SPOT/issues) and I will be sure to bring it up in the next project...

Hello @kpeiruza Thank you for your contributions. In order to complete this Pull Request, please fix the conflicts