added another line
added a different line
fixed conflict