resolve merge conflicts of a9ffcc1 to master