CI is clashing with master code, cannot build app <!--session: 1616306527112-b5ea1165-fce3-498b-bde2-17ee45b801f2-->