changed line 1 to 'line one'
fixed conflict in foo