wtf merge, not working thru windows github gui....