some changes
fix merge errors