temp fix for findconflict6
Merge origin/master