diff --git a/.doit_conflict-20150123-230009.db b/.doit_conflict-20150123-230009.db
deleted file mode 100644
index 7f2590bf..00000000
Binary files a/.doit_conflict-20150123-230009.db and /dev/null differ