Resolve

r conflicts