merge error with goaltyp
theirs goaltyp.ML