resolve the conflict issue... just pull