Fixed merge conflict

	remember: Send text message only on physical device