Resolving nib conflict, then adding new stuf in in next checkin