removed header conflicts