updating modules ref
merge conflict