Modified in first branch
Modified in second branch
After resolving conflicts