did energy shit
done merging