some text
conflicts and cleanups