add some strings
fix merge