resolve conflicts
resolve conflicts

clean up different versions
ignore xcode files