place names
resolve merge conflict
adde notes