small changes
fixed merge conflict