Conflict resolved

This fixes a conflict in the contents.plist.