Remove diff logo from center template
Fix merge conflict