Remove incorrect merge/conflict lines from MPUTeapot.pde one more time