a ster etc
merge conflict resolved