catching up with remote repo
fixed merge conflicts