switch to luminus template
merge conflict