Solved merge error. Stupid git bug