conflict request when merging was resolved using the wrong version of a file, fix it
conflict request when merging was resolved using the wrong version of a file, fix it

ninech/uberzeit,ninech/uberzeit,ninech/uberzeit,ninech/uberzeit