style changes
question template merge