fixing indent
fixing conflict and indent