dump from hosting server
resolve conflicts