overlay re-added after merge conflict
*save and publish* button added to Edit planned asm.