add test
fixed bug
Merge pull request #189 from if045/IFJJV-196-IN-Tests-for-conflict-and-feedback

Checked