Quick fix for merge hidden issue