branch test
feature1 simple
master simple
confilict fixed