fixed map js from merge stuff