Commit local modify
merge remote changes