structure project
fix conflicts