upgrade pomelo edition
fix conflict