Making everything up to date.
fixed merge conflicts