updating to the last EAP
resolve conflicts from EAP upgrade