Fix Merge issue.
Solve Conflicts between master and componentAnalysis.