conflicting versions

updated conflicts