Fixing a conflict with subtree in phi-framework.
Fixed conflict bug.
Merging with phi repo to fix conflict bug.
Changing a comment.