xcode build support started
conflicts fixed