Hotfix in A file
Another Hotfix in A file
Resolve conflicts with Hotfixes.