Removed merge stuff I accidentally kept in