Removed leftover merge stuff