2220 30 1. Git resolve conflict without merge.

Tsebo cleaning applications 2022. Natis contact details.