finalizing repo
fixed merge conflicts