Fixing all the conflicting code