committing for backup
fixed merge conflicts
fixed merge conflicts