Resolving conflicts and updating files