Automerge: change in fix_2 (conflicts!)
I've resolved another conflict
test MERGE_ERROR file removing
Merge branch 'fix_1' of https://github.com/nata332/CReview into fix_1