fixed merge fuckup #publish