Local changes
Fake commit
Fake commit #2
Resolve conflicts