Fix newlines in how-to-merge. Added steps description. Fixes #3772