main > Main, fixed conflicts