plan
adds style
merge