trying to clean up conflicts