minor updates
merge deconfliction