merged branch fixhow