03-04 Merging Basic Conflicts (JPG)