Commit for conflict j3c8
fixed conflicts