corrected some merge stuff,ali watch language this is public!