Fixing bigdrum merge issue