merge shit
fixed shit