branch commit
and simple
master change
confilct fixed
feature
new merge
message
merge