Fix conflict path