Replace for real content
Solve merge conflict