NEATManager updated
conflict resolved