Remove merge stuff