- small fixes to end merge