fetch from server
fix conflicts