change back to ec2
merge