Controller create Trigger angelegt.
merge conflict resolved.
resolve conflicts.