resolve conflicts in headers