Before merge with remote
confl
First step about scans control