resolve indention merge error