some minor changes
Fixed merge conflict.