Remove delete and add button
Merge