updated stare
resolved stare conflict