Conflicts are fixed in: libraries/app/database_api.cpp libraries/app/include/graphene/app/database_api.hpp