FIxed swift conflict