Made it merge compliant.