Fixed Nicks merge