Fixed merge conflict in Surface.h