Fixed conflicts

client/views/app/message.coffee

@@ -78,12 +78,6 @@ Template.message.helpers
 
 		return true
 
-	oembed: ->
-		$body = $(Template.instance().body)
-		return null unless $body.is('a[href="'+this.url+'"]') or $body.has('a[href="'+this.url+'"]').is()
-
-		Template.oembedBaseWidget
-
 Template.message.onCreated ->
 	msg = Template.currentData()
 

client/views/app/message.html

@@ -42,12 +42,11 @@
 			</div>
 		{{/if}}
 		</span>
-
 		<div class="body" dir="auto">
 			{{{body}}}
 			{{#if hasOembed}}
 				{{#each urls}}
-					{{> oembed}}
+					{{> oembedBaseWidget}}
 				{{/each}}
 			{{/if}}
 		</div>