add style
edit style
edit style.css in styleBranch
Merge conflicts are solved
 Merge conflict solution II
one more editing style in master
editing styl.css in databranch
 Solve merger conflict from master to data
edit style.css in master (I am master)
master: git merge data
 Edit style in data
bot modified
add person.dat
Merge branch 'data'
add folder to master
 Adding to info file
Add dataperson