fix for merge