Fixing compile error in merge