Fixes minor issue
Resolve conflict