Fixed up latest commit
fixed conflicts