fix template rendering issues because of lack of data
handle merge conflict.