Merge conflict fix

Fixes merge conflict caused by simultaneous edits of the files.