fixed some shit
finished merging in the files