Fixed merge header conflicts