fixing merge issues
adding source map for debugging