up1 e
e1 u1 e
e1 u2 e
Merge branch 'e1'

Conflicts:
	A.txt