use public server
fix the conflicts