Suchar #1
Suchar #2
Resolving conflicts.