Modify by patch A (Modify to conflict)
Modify by patch B (Update 2)