few changes
merge conflict fixed