committing changes quickly
merged conflicts