merge nicklmarks local with theolesband master on godaddy