initiate conflict
resolved