fix issues on rebase

I think you had a few issues with the rebase that modified some files it shouldn't had. 

This checkout some files back to their original state.