first commit to back_branch and resolved conflict in rebasing
$added feature back_branch and file_2 and resolved second conflict