chip in works
fixing db merge conflicts