introducing a conflict on the ec2 file copy...