Resolve merge conflict in Makefile
Resolve merge conflict in db-dump.py