Linux pc commit
fixed conflicts