made lots of change
merged conflicts