after merge with remote