Fixing errors. Errors due to interface still exists
Fixing Merge Conflicts
Merge Conflicts 2

please work
merge conflict fixing try 3
Fixing merge conflicts try 4