Fixed a lost line of code after resolving merge conflict