Some new file added while being in branch
Contents of file created by john changed by sarah
Just completed by branch merge work