fixed conflicts in main