fixed errors in 1987 1988
trying to fix errors
fixed conflict in 1983