add smarty literal markup
resolve conflict