Resolve merge conflicts from master