Changed options lost during merge