Added a feature by the main team.
added a feature on wf2
merged master with wf2
feature added by the wf ream
merging it all
Solving Conflict
Done