Bugs removed
Conflicts fixed