[CHANGELOG] Remove merge conflict markers
[CHANGELOG] Remove merge conflict markers

mvz/bundler,RochesterinNYC/bundler,bundler/bundler,mpapis/bundler,asutoshpalai/bundler,seanlinsley/bundler,bronzdoc/bundler,bundler/bundler,bronzdoc/bundler,mpapis/bundler,dilumnavanjana/bundler,asutoshpalai/bundler,seanlinsley/bundler,dilumnavanjana/bundler,RochesterinNYC/bundler,mvz/bundler