scp project
resolve conflict from casa