attempting to fix issues from the recent merge