Event redirect fix
resolve conflicts