Merge conflict cleanups