Merge Watchface changes with Conditional compilation