updates to remove merge message