Cleaned up some merge problems