merge error, now it should works