added random stuff, fixed merge problems