Fixed other merge and editing errors