Remove broken merge stuff.. :-(