Conflict resolution: 1. decided to add the build-image workflow, we can adjust it later 2. JS conflicts are just missing semicolons, added them 3. en_GB translations were removed upstream, following them.