fix stupid merge error