Fixed bug on merge