Merge error in backend __init__.py

[zsinnema]

@rgerkin can you please have a look at the dev tree
e.g. this file https://github.com/scidash/neuronunit/blob/dev/neuronunit/models/backends/__init__.py has merge conflicts inside

[rgerkin]

Gosh, this is awful. Do you need the dev branch for anything? My hope was that you could work strictly from the metacell branch.

[zsinnema]

Yes no worries, I use the metacell branch :-)