made changes
cause conflict
conflict
merged branches with ocnflict
my second branch