upstream updated one line and added fourth line.
fork changed first line and added one line.
fixed conflict.