Fix errors with merge, update messages