add 5 text
minot merge fix