Resolving merge conflicts and updating tag numbers