Fixed last of merge stuff