1. conflict error fix.
	modified:   enigma2-plugin-systemplugins-crossepg.bb