Added yay
merged with server and resolved conflict - went with yay option