Fixed error caused by overlooked merge conflict