correction, finitions
resolve conflict