Fixed error in code after merge