solve push message problem
solve conflict