Fixed Sublime conflicts
Don't remember what I did
fixed conflicts