Resolved conflicts in imageapp/sqlite.py