fixing deploy error
fixed conflicts
updated Settings