Added my quirk
edited quirk
using given/theirs
added new