Removed wrong merge stuff