fix merge fail: missing end in status.conf
minimize changes in brackets