Rename Tag Pattern
Merge and resolve conflicts