removed branching practice
P98 : Conflicts and merges