Add exclamation point to header
conflict resolution