database updates
resolving merge conflict