fixed conflicts, final MVP