fixed minor issues with merge