End of strike at Marignane airport