Fixed indent error caused during merge