Added conflict resolution to order editing
Merge branch 'master' of https://github.com/SimonKaltenbacher/dbprakt