merged remote with deleted local
commit nonsense
more nonsense