structure
fix conflicts