add trailing newline
merge commits