added more types
resolved conflicts