Little fail in the merge