Herp derp, missing }.. Merge error by me.