UPDATE Passthrough fix after conflicts