cleaned up the fromJusts
merge conflicts