finishing map interface
fixing merge conflict