Remove some conflict markers

Remove some conflict markers from EC2Slave.java  This class doesn't work
and needs to be modified to be an abstract class for Spot and Ondemand slaves