Upgrade resolve to 0.6.1