Remerge from ozfortress