Test 3 and final. Conflict seems to be from xcode being open while merging because UserInterfaceSate is different.