creating conflicts and ruining ppls' days
merged conflicts