fixed formatting
fixed formmating
fixed conflicts
changed min sdk