some work
fixed merged conflict