resolves merge conflicts