merged with main, fixed conflicts