fixed funny merge business

git is confusing.