commit of production files
some merg probs fixed