some stuff
fixed comflict
fixed a stupid bug