Same-sex-marriage to be incorporated into main Manx legislation