morning update
badges working
so there were merge errors, trying again now