resolve conflicts

Signed-off-by: lequana2 <lequana2@gmail.com>
Merge remote-tracking branch 'origin/master'