Project for a better understanding of branches and conflicts