Conflicts resolved and updated