Merged updates and changes for neighbor clashes.