Small formatting changes
Fixed conflicts
Fixed more conflicts