changed a line in test1
hotfix
added another line
fixed merge conflict?