didid
fix view null pointer except
fix conflicts