Automerge:  fix_2
Automerge: change in fix_2 (conflicts!)
I've resolved another conflict
[no task] Added file with failed during auto merge branches.