changes in xib to demonstrate conflict
changes in xib to demonstrate conflict, resolved