resolved merge conflict

This commit just pulls in the current state of master and resolves the merge conflict, once you accept it your PR should be mergable.