Add plan
solve merge conflict