Cleaned merge