fix(changelog): removes conflict markers