fix merge, no really