Revert "merging conflicts"

This reverts commit 17fe15abab01054b0385f665502313f4e18deabb.