Removing bug
Resolving merge conflict