Resolves merge conflict