Fix merge issue

Authored by mardelle on Mar 15 2019, 9:00 PM.