fixed some minor codebase conflicts