One X signal patch will be in device_htc_endeavoru/overlay
Deleted conflicted files