restyled - basic
merged conflict