fixed minor merge bugs: user-image, map interaction