fixed the bug
resolve confilict
resolve confilict
notes are aded