1.5 done
using mine - merge resolved