New branch created and sysout changed to force a conflict