resolves merge