Just fixing minor merging issues.