Fix conflicts of codereview mechanics and master branch