get a structure
fix conflicts