Fix conflict bug