valami start
feature1 start
feature1 end
valami fix
valami fix2
merge conflict
feature2 start
feature2 end
master is halad
conflict
master 1. sor
master 2. sor
feat1 1. sor
feat1 2. sor
master 3. sor
master 4. sor
toplak
toplak merge
master init
toplak