Automerge: change in fix_2 (conflicts!)
I've resolved another conflict