Removed git header conflicts