(cleanup) resolves more merge conflicts