gah! merge conflicts