Fixed the mess left by merge conflicts