let's get rid of that settings reorganization merge