Unify to forestry apatite
Update patch file