Remove a conflict in CT client file