What I have so far.
fixed conflict