abc

abc
def

def
ghi

ghi
resolved
Merge branch 'another-Brach'

Conflicts:
	abc