changes
fixed merge conflict