fix minor merge changes