db content changes
resolving merge conflict