Removed unused method
Merge conflict
merge fix