build : [little more] shuffle code to avoid merge conflict