Fixed wrong merge line