6am commit KZ
resolved confilicts 6am kz