Yay resolution of conflict. :)