I don't think you merged properly. Please check to make sure everything works.