removed merge stuff