Resolves merge