fixing uart merge conflicts