Added outline
Remove conflicts