Fix merge issue on WatchFace.cs file