Add new line
Add line for Master Branch
Resolve conflict