Apache headers and code formatting changes.
resolving conflict
style check for merlin core