Formatting the code.
fixed conflicts