Removed conflicting file
resolving conflicts with renaming