fix some references
fix conflicts