minor update
conflits solved