dev3 updated and try to commit
dev3 merged the conflict and commited the change

Signed-off-by: tom <tom@gmail.com>