remove left over conflict marker (#1248)
remove left over conflict marker (#1248)


flutter/plugins,tvolkert/plugins,mehmetf/plugins,tvolkert/plugins,flutter/plugins,mehmetf/plugins,mehmetf/plugins,flutter/plugins,mehmetf/plugins,tvolkert/plugins,mehmetf/plugins,flutter/plugins,tvolkert/plugins,flutter/plugins,flutter/plugins,flutter/plugins,flutter/plugins