Removed broken handler. Ignore single newlines in input.
fixed conflicts, removed empty lines.