nose added in 2nose
added nose in tail
resolving conflicts using theirs