finish integrating xsde
fixed conflicts after integrating with xsde