dummy
resolve conflict
upload file to EC2