did not properly fix ALL merge conflicts before previous commit.