-m
merge state
fanny changes