no tengo idea de que es esto
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/bridge/css/style_dynamic.css
	wp-content/themes/bridge/js/default_dynamic.js