An option to disable auto remerging by make.conf changes