resolves merge conflict