standard version. P/s: anh em chiu kho push, pull
deleted conflict