Resolve conflict in previous commit

b9914299e402cdcb27cc61236bdb808fa053bfaa