made some formatting changes
fixed merge conflict
fixed some other problems