staring energibar :)
conflict resolved