(cleanup) resolves merge conflicts