add changelog
fixed merge conflict