Fix conflict due to the merge