Fixing bug on merge