fix for merge tests