Cleaned up some wierd merges