conflicts.. Again!