Finished sotu.htm conflict resolution - i hope.