initial commit
Removes placeholder content
Fixes offsets
Resolves conflicts