Fixed conflicts

Git put some conflict errors in the file that I didn't realize would
stay with the up-sync. Got rid of them and the conflicts that weren't
fixed in the last merge.