Attempt to fix huge conflict