some updates
merge conflict