CI is clashing with master code, cannot build app <!--session: 1616306152400-7575dc50-0a42-42a6-9702-ed58de35050e-->