Updated from the server and resolved the conflicts