Redone the mearge form Glydar repo

had to redo mearge as my Github for windows muck up :(