renderOk properly
resolve conflict