hero w/ trans caption
fix conflicts