Resolving header conflicts