fixed the issue on master
solved the merge conflict
Notes added