Fixed a merge-bug
1 file changed