cleaned up conflicts