update
merged
some changes
fixed up merge conflicts