fixed automerge duplicate code

removed duplicate code that was introduced with automerge of master
into adding-points-into-maps branch. Working fine now.

Issue #41
Close #41