Removed merge stuff