lolchange
fixed merge conflicts, accepted master branch