do not match end of line
Resolve merge conflicts
update changelog