updated code
conflict removed
updated helpful tip code
conflict removed