fix merge confict and update render for psp