Stage all changes to fix branch conflicts