Try this
Merge remote-tracking branch 'origin/dark1' into dark1

Conflicts:
	res/xml/display_settings.xml