fixed merge issue after re-commiting desired changes undone previously