Conflict checking from branches/release-1.0/thirdgitfile.txt