general - fix merge mess