init check in
fix merge