fixed some minor merge conflicts