updating with gedas merge