new remote
fix merge