bug fixing for version 1
haha
Resolving conflicts in Second Branch
Completing Second branch