mods on master
Merge remote-tracking branch 'origin/feature/1_2'
confilict from branch
Merge branch 'feature/s_x' into develop