Fixed merge change