This too good.
not really sure, minor things
Handled conflicts