fixed terrible awful merge problems