Added link to information on addressing conflicts when trying to merge files