added ln links ec2
fixed conflicts
some changes