unified objects. compiles
added files
fixed conflict