Is Morrocco in a territorial dispute with Western Sahara?

The people of Western Sahara declared independence in 1976 in a small hamlet called Bir Lehlu. At that time Morocco tried to occupy the territory. In 1991 a ceasefire was reached between Morocco and the independence movement POLISARIO, monitored by a UN peace mission called MINURSO.