commit 1 - team 1
Merging is conflict is resolved
final commit of rel 2