Fix error due to changes made by merge