cleaned it up
better
fixed conflict