fixed conflicts from commit with slight changes