updated push to use # as well as remote delete, added merge function (a;so uses # in name)