Fixes error in merge