my changes
cleaned up conflicts