merged in all new files from broken git workdir