adding execution plan remove method
partititon test case
fixing conflicts and merging