fix copy-n-paste typo
save
resolve conflict