798ed8f
There was an error while loading. Please reload this page.
Bumped version to 0.5.0 now that conflict resolution has been added..
