cleaned up pre-merging in luminis-template