changed afile in branch2
edited afile again