Cleaning up some code.
Correcting conflict