done button fix
Removing conflicts
Commit changes