working
work
fixing conflicts
enhancing database
database
resolving the conflict