Fix conflict error