Working answer branch conflicts