add from local again
merge from local again