Fixed failed merge and added my name.