Resolve conflict derp