fixed conflict
c
fixed letter_opener
fixed conflicts