Go back to stock - merge worked but build failed.