Apache headers and code formatting changes.
resolving conflict