cleanup object files
fix conflicts (seriously?)