Fixed unwanted merge change