Fix Shallow merge