Removed bug from merge