Hello, I am having problem with merging the code in same file, 2 people are working on same file, we can see difference in line of code in that same file, but could not merge the non-existing line of code from one file to other file.
