added the combining file
Merge branch 'ShabihsBranch'