Line added from GitRepo1
Line added after resolving merge conflict