Quick fix of merge