Possible conflict fix

Could it be this easy?