Update code style for merge