more changes
merged
more changes and styling
updated
updates
resolve merge conflict