add files in iMac cgate
resolve conflict