bux fix, v1.2 for production
new resolve merge conflict