sectors uploaded
fixed merge conflicts