Cleanup of merge conflicts and example structure