fixing some minor issues with the merge