fix merge conflicts
fix merge issue in constructor