f: add content
conflicts fixed