Merged new merge code. Updated line plugin.