/biocompute_git_branch_example

biocompute_git_branch_example

Conflict happens

You can deal with it

This is for a merge example