Fixed 'enhancements' merge