Try to fix conflict per your instruction and hope this work