Complete resolution of merge conflicts that Taek checked in accidentally