fix for merge + version 11