resolve conflict
Signed-off-by: Tee Jia Hen <wiztjh@gmail.com>