correct repo url
0.3.1
using ptic
conflict merged