start working on combine style 1
combine sytle from designer 1
save current state
merge confilts