making important sugarr
fixing conflict