Making unexpected file replacing impossible
Resolving conflicts