first linux commit
fix merge on linux