load data from server
merge conflicts