Fixes conflict issues with swift.