commit all
cloning alm-scripts

how to fix git conflicts