Revert "Deleting some merging residue"

This reverts commit f2ff990c773e305dc6efe2030f79c8ff55ea7eab.