this is a dev commit
feature1 commit
master commit
this is a good commit
this commit
file in the master file branch
this is a merged file
this is a added file in the feature1
this is a file added in the master
ad
this is a merge file