Fix merge conflict in uart.c
Fix more sloppy merge errors