This merge proposal's problem is not the conflict but some failing tests. They
are all schema-related and I'm waiting for some help with them from Cezar.
Until those failing tests are fixed the branch cannot be merged.
Your team Zorba Coders is subscribed to branch lp:zorba.
Mailing list: https://launchpad.net/~zorba-coders
Post to : email@example.com
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp