An option to disable auto remerging by make.conf changes
Merge pull request #129 from artem-sidorenko/makeconf_changes

An option to disable auto remerging by make.conf changes