minor changes
---
resolving conflicts