hmm
merge conf
fixed hella shit