Resolve migrations conflict
Resolve migrations conflict

darjeeling/k-board,hyesun03/k-board,guswnsxodlf/k-board,guswnsxodlf/k-board,cjh5414/kboard,kboard/kboard,hyesun03/k-board,guswnsxodlf/k-board,kboard/kboard,cjh5414/kboard,cjh5414/kboard,kboard/kboard,hyesun03/k-board