del one line
merge with remote