Removed merge left over

Authored by fabianr on Sep 12 2019, 1:54 PM.