Updating Phison to support comment merging