Addressing merge comments; newlines, signature comments