conflict-resolution

updated on remotely on github