removing tmp files
Live changes
Local dev changes
Fixed conflicts