Rebase conflict resolution removed two methods accidentally, replaced them