style header
remove conflit 1