Formatting changes.
Fixed merge conflict.
Found another sync bug.