Repaired AWS files conflict