Added ConflictResolver
Freeze rugged version.
Database refactor.
Added specific exception.
Complete pending tests.