Resolved naming issue bug
Resolving conflicts