removed s
added a's
conflict removed