fix merge

Signed-off-by: Thawatchai-T <Thawatchai.T@carpass.co.th>