solve merge conflicts

2 jobs for Hofer-Julian-master-patch-98963 in 19 minutes and 35 seconds
latest