merge with texture changes