Lady, EVOLVED 
@Lady you did not approve the MR that unbroke this either yet
@aescling yeah it is in fact merged
@aescling oh there’s another one
@aescling i’m going to do crimes and squash those commits so be prepared to git reset --hard origin/trunk
@aescling done, you should be able to fetch and then reset
@aescling one of these days i will set up CI, lol