Merge edit tempate back into main.