Simplify import
Add tests covering multiple writers cases

- changes propagating
- update in remote repository
- conflict with update in remote repository