Removed merge annotations

I've got to figure out how to merge!