fixing merge bugs
whoops
netter title