Minor changes

- conflicts