fix merge conflict and push groups