Fixed merge overwrite