Remove the innocuous change.
fuck you merge