added a picture and merged a conflict