Moved to v0.5.0
Added conflicts section for the -git version