Fixed merge conflicts and weird copy stuff